bitkeeper revision 1.1159.1.380 (418ab5a2xXnW5CFXsiZAFTOcTkURYw)
authorcl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Thu, 4 Nov 2004 23:05:06 +0000 (23:05 +0000)
committercl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Thu, 4 Nov 2004 23:05:06 +0000 (23:05 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/local/scratch/cl349/testbuild/xen-unstable.bk


Trivial merge